bitkeeper revision 1.1294 (425d9f852SL8ULzr5896Y6r81VmGmQ)
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Wed, 13 Apr 2005 22:39:01 +0000 (22:39 +0000)
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Wed, 13 Apr 2005 22:39:01 +0000 (22:39 +0000)
commit56b13d989273cf415cb5c9ea53109ac206550584
treea2670a557cf3b9268e14ca9dc2cb4c5da7ea5c6b
parent6ad2bc6f6dbf36e63a157b489a6bc85312bc2baa
parent69f16b1102636f075b1ad8a7fe6688436336c0ef
bitkeeper revision 1.1294 (425d9f852SL8ULzr5896Y6r81VmGmQ)

Manual merge
BitKeeper/etc/logging_ok
linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
tools/libxc/xc_linux_save.c
xen/arch/x86/smpboot.c